Fix issue with property injection