Fixes redmine #33