Updated current thanks to 3032962