try to fix all internals