Fixed #690