Fixed #2 temporarily by moving logs