Fixed #687