Fixing #26