- Fix for commit order issue