Fixing some earlier stupidity