Fix for Item#33173