bugs fixing after package check