Fixing silly mistakes, again