Fixed invoking wrong method
Added default value