Temporary apcu fix