a bit of fixing