FIX: Fix logging issue