Fixed issue #2 and verified in server console