Fix issue report by Dory