check out missing code from 361a1e2