bug fix and missing ";"