bugs fixing 1