VF-4478: Added proposed fix from HaraldK