Leandrobrunner issue 34