Implements #1105
Implements log info on #1105