Fixed compat with new GBToolbox