fixes some initial problem