fixes for improvement GH-16