some fix for issues #1442