seems to work OK now