modify for #488