Patch by Chris Jerdonek. Address Ezio's review comment.
Attach a file by drag & drop or click to upload
