Updated to redirect cleanly