fix bug
refactory codes rspec v2