fix on hasfix enabled too early