Fixed the preposition bug a little better this time