HOTFIX IN PROGRESS - expand logger