fixed current being null on first element