prepare will now work again

Change-Id: I377454688cbb85c72f17259cbf2d2727d5d43123
Merge pull request #10 from techmik/new-10.2

prepare will now work again