and bug 523 also done