Fixing #169