Fix #12 again.