fixed -Werror=reorder errors