Slightly fixed up switch