Initial fixed commit I hope ...