Bugfix + simplify special case for genesis
Merge pull request #2190 from sipa/fixgenesis

Bugfix + simplify special case for genesis