Refactoring had a stupid if clause ;D