Fixed bug in building CFG #137 #138