Fixes #5192