[#3017] Fixed issue (for real, now).