Closes #689

#689