enable temp fixs from before