Fix #560