[Issue #93] fixed return values