Closes #401

#401