new version

* fixed unwanted forcing to wrapped mode

* regress test

Regards

Pavel