Temporary fix for server