- Fix for cyclical depedencies lockup