Fix all this shit