fixed more patterns