Fixed wrong content being passed in callback functions