Fix issue with cycling modules dependencies