Fixes redmine #47