Fixed no-redirect bug on same page