working fixes