stub and re-fix