Fix for weirdness