Fixes #232.
Merge pull request #234 from AshFurrow/mixup

@orta => Fixes #232.