fixed brokenness