Crappy workaround for #618