Fix issue reported by Dory