1.5.0.18 dev

Bug fix on setup logic