Fixed issue #8 and verified in server console