Fixed #759