Possible fix for APCU (7)