fix for server issue #61