attempt to fix #452