slightly better regexp