Very necessary credit to tu_79 in ChangeLog