old missing commit
ported to rescala refactor (eef99)