Closes #646: Fixes introduced bug