Added fix for error in server