DELTASPIKE-739 - Fix for @Typed