Fixes recursive dependency