Fixed statement order bug related to Upstart