Use branch of MagicKit that support overridble