BUG: Closes Trac #2197, #650