Fix for earlier commit