Fixes issue #1 for real this time.