FIX issues with treshold