CE-1103 Fix typeof usage