[REQS-648] Resolved type safety warning