[BUGFIX beta] Potential solution for #4474.

Closes #4474.