fix get handling code
tweak