Fixing #108