modification for #488