Fixes redmine #85
Fix redmine #87