Fix #127 on the right branch, dummy.