FIX: Fix rendering