Closes #590

#590