BUG: Corrected commit 8907dce