Fixing this atrocity