Index error.  Fixes issue #25