fixed overflow issues found by testers :)