bugzid:7456 adding additional type safety