Fixing Dane Bug 2