Removing temporary fix