Maybe fix redmine #95