And another bug fixed