Fix for latest commit