0728-2 bug fixing