fix question handler