Fix subtle bug