Closes #604

#604