Fixes redmine#114