Possible fix for some things