-Fixed logging