rake and fix bug