bugfix and framework adjust.