accepted suggest on issue #16