Fixed #668