Modified listen_for regex to fix #2