prevent callstack explosion
gardening
make it work with react-tools 0.5.x