commit: Fix for issue 521