Possible fix for APCU