LASTEXPRESS: Redo d71b48 and use variable instead of commenting it