Fix accounting