Fix #611