Continue trying to fix this shit