Implement partial fix for 3882