refacto: move back the instantiation in postLink