Added bug fix for QWERTY users...