Compilation workaround, pt3