tweak by @mislav code review