#1446 bug fixing