FIX remove unnecessary set