BUG: Correction to commit 0b2e5fb