Another workaround for a dumb variable replacement