fixed marking problems