Fix with latest commit