Fix for the latest commit