Workaround for deadlock in dynamic resolution. TODO refactoring of
dynaman