Bug Fix: Check text only