Fixes redmine #151