more fixing
last try before sleep