Fixed a sunday bug