Bug fix for commit