BUG#707 Fixed