Change based on suggestion from @hai-cea