Put handler back in...