Bug Fix and threshold