Fixed  #85

Now working fine :)