Fixed Setup Bug