Fix #744