Once more...

Fixed: #2

Change-Id: I3edb1875d61fb976cf6485c650f4fd4b82fa354c