Fix issue with after create scripts