Hot patch fix for right-rail issue