Remove temporary fix