some fix, again
optimizations