Fixed #79

Now working fine :)