fixed current() method