Fixed bug in previous commit

Change-Id: I710144d43339413c39b52d211e6639aba5c726c6
Signed-off-by: Marius <marius.oe@gmail.com>
Merge pull request #97 from mariusoe/master

Fixed bug in previous commit