Fixed #80

Now working fine :)