Fix requestId to be id (fixes #126)