fix to work w/ standalone