fix for optional field