Fixes redmine #263