Date restrictions fix; fixed #42