self-fixes