bugs were fixed again