fix issue #26

Change-Id: Iabd28a8272c14c9b17253d81b7e2388d08ec7086