Fixed bug with creating cell class