Date queue fix for #3