fix + chore (#585)