Fixed issue reported on MCF