Changed order of statements in Courier::Main