Fix corner case for #161