Be a bit more conservative when applying the hack