Fix for passing 'current' into callback function.