Fixes #4554