solved issue 28