Fixed #740