Fixed logging - WORKS!