Fixed bug with setup
Fixed bug with routing drafts.