Added workaround for a server bug.