Fix issue reported by MapR