Fixing support of new params to 1.9 compatibility only!