Modify rakefile to try to deal with #1