another attempt to fix issue 115