CORE: refactor 5fc7dc4 to work properly with tractor
Merge pull request #288 from maxtherabbit/master

CORE: refactor 5fc7dc4 to work properly with tractor