fixed here with some checks on status.