Fixed bad quote matching