Fixed START/MATCH issue