Attempted Bugfix

May or may not work.........