bug fix + added sources