fixed the mess up