Fix #307 and #305
Fix #307 and #305

https://github.com/ChildrenOfUr/cou-issues/issues/307
https://github.com/ChildrenOfUr/cou-issues/issues/305
cjandrasits/coUserver,lizzard/coUserver,ChildrenOfUr/coUserver,lizzard/coUserver,lizzard/coUserver,ChildrenOfUr/coUserver,lizzard/coUserver,ChildrenOfUr/coUserver,ChildrenOfUr/coUserver