[Bug 522] Changed - porting problems