Another fix for bad things