Added George's fix