Fix for commit bug