Fix #626