fix for #136 and JIRA MC-260