improvement: using strict types to avoid erorrs like issue 2164

improvement: using strict types to avoid erorrs like issue 2164 #3362