fix for  #1082