Fix method and remove decorator