Fixing goofiness