Correct the behaviour of directive creation with change request