Implement fix for 3882