Fix exception
Merge pull request #66 from AndreiH/fix_exception

Fix exception