eval
bug fix