bugs fixing - broken