Bug fix for the server