Bug fix: Long userId changed to String userId