fix bug :whale2: