Fixed an issue with latest commit