added quick #id check