Maybe fixed goofy bug