Minor master switch redirect issue solved