closes  #369