finally fixed this shit