Updated fixed commit