Hot fix for Bancha, should be rebased when incorporated in the official repo