Fix problem with Visual mode