UPDATE: Fix threshold issue