Improve Bide fix