Fix issue with current being null