Use startswith instead of contains to avoid conflicts.

see #631