Fix for TYNSTEP-430