make more robust against redmine defect 13118