Fix bionic toggling
Merge pull request #10253 from i2amroy/Bionic-Fix

Fix bionic toggling