Fixed #81

Now working fine :)