cr fixes #1