Fix for daily models (needs testing)