Changes in class fixing error