Cathy Fix for Redmine #1061