Closes #588

#588