workaround for C2 after April 2011