Better fix for time constraints