workaround for invalid 21 on production