Fixed issue #63

Change-Id: Ia57d0cccc94b54d04762f4b1eba071253751885f
Signed-off-by: Marius <marius.oe@gmail.com>