Can now deal with hidden columns