improved apcu workaround