Micro Switch/Dome

99 Boxster Base. Both windows don't roll all the way up unless I shim a small piece of rubber between the 'hook' and the latch. Am I correct to replace the micro switch located in the dome light? It only works with a shim .....if I push it with my finger it doesn't work either. Thanks V