fixed GITHUB#5