fixed current functions