Possible fix for APCU (8)
Possibly last for for APCU under Travis