Fix support for Someday (following API change)