#56 - workaround for the CIAPI.CS bug