Dev/0.9.7/logging fix