Fixing bug on class type
Merge commit '550a337d07b5f1770fe4c25f2819371c0dbe1aa3'