Fix bug - too much logging