FIXED: Parse circular dependicies