Fixed redirect checks