Fixed handler valriable overwriting