Fix for broken commit