update according to recommendation from stas@