Fix typo and improve semantics #27