implementing issue 28