Fixed #674