[#2080] Better, more generic fix