Fixed #624