make sure data is properly passed during navigation