Fixes a bug that got somehow pushed from wrong branch