Improved (fixed) logging behaviour