and another bug fixed