fixed option value
fixed cases with empty surrounding mappings