added fix for the change with optionals