Fixes #17

Change-Id: I3a9c35d9e5f6b98c02b3858dc3de959e8ce8925d