Rearranged two lines to avoid warnings