Fixed #659