Fix Redmine #743 rev. 2