prevent similar bugs from #464