Fixed #660