fixed issue with future data