fix issues with new commit