152 fix #624