Readd hack on compilation