Fixes #4024, Fixes #4028