Fix #740