solve issue 27