No need for this hack anymore