Possible fix for APCU (2)