Possible fix for APCU (5)