fixed non-properly cps stuff