(re)fix issue 7