More empty variable fix