Fix method order