Code reorder
Fix stupid error