Fixed the ability to onboard properly #138.