Possible fix for APCU (4)