fixing issue-2 + default class value params