Fixing longstanding digital, double barrier bug