fixed current_user thing