fixed #624