Nimit's fix for all visits