Old fix and commentAPI class