Re-fixed a merge unbugfix

Yeah, try parsing that