Move, fix bug