fixed issue GH-99