fix regexp for shape