Fixes #4177