Possible fix for APCU (3)