Compilation workaround, pt2