Bug: logging fix