fixed on edit #1400