Fixes Redmine #91