FIX: Fix raw plotting