Closes  #2246