FIX: Fix logging