Rebuilt project again because of VS xml-bugs