Hopefully fixes an annoying little bug