Small fix 18