fixed issue GH-59