Work-around logging order