Closes #538

#538