Fix for BOP crash