update of fix #13 for package and system