Possible fix for APCU (6)