Prepositions fix

fully apply PR #25