Fixed #686