Adding fix for PropertyNotFoundExceptions