Corrected major bug in W1