Fixed class binding and another bug comes out