Redmine Fix for #1022