Closes #419

#419