Fixed high/low vs current bug