Wcs/new model fix

Same as PR #83 was overwritten by another PR.