TYNSTEP-588
Fix to TYNSTEP-547?