Fixed issue #2 for real this time.