FIX stupid bug