fix of BUG 512