end of fixing issue #1442