Fixed #744 and #745