Temporary fix for client render issue