Fixes #4998

This should do it.