fix Issue_#3