Last fix for #36 is incorrect. Fix it again.