Fixed issue #89

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