Fixed cyclical dependency