better ca1e81a again

Gosh - even node IDs were counted different in 1.7 and 2.0 envoronments!
Needs to get refactored in future.