Fixing sunday glitch