Fixed issues in refactorings for #287, #288
Authored by: numere 2018-07-30
Parent: [r369]
Child: [r371]