Fixing #3.  :P