Fixed initial setup