CFY-1000 minor fixm oops..