Fix for stuff