Fixes #4103