Fixed #666