Fixed #621