Bugfix for evaluation of 'wrap'