Bug fix with last commit