Fix aff creation