Fixing yuck