Fix weekend support