FIX. coding issue