v0.6.1 Fix bug with construction.