bugs were fixed