recent actions tidy up - bug introduced in testing though