Fixed #87

Now working fine :)