hopefully fixed ot
fixed excessive dereferencing
Merge branch 'master' into zero-fix