Fixed subview issue... again