Fixes #4181