Fix for scoped with date