fixising issues