Revert "Revert "fix for 5.3""

This reverts commit afb44247d273019b75b12cd4fed562ec001cc6ea.