fix initial setup