Fixed untested callbacks (still untested)