Small fix for optional