Temporary fix for a server bug