bug fix for 1-17