relax regexp to catch more cases