Correction after hatstand's review