Fixed: This isn't hacky