Fixed a regression introduced on last commit. Should have created a branch for this bug.