Fix: Bishop correction final
Merge origin/master