Closes #549, fixes bootstraping