[BUGFIX] Use provided id to track method calls