Fixes #4068