BUGFIX: Braindead error that caused an inf loop