Fix Incoming controller