fix
tweak for common source of bugs
fix