tried to fix #439