Fixed recursive issues again