Fix for bad things