re #164 - better way for wrapping, works everywhere without extra code