Added check for setup complete fixes #751