attempt at fixes