Bug fix with setup