Fix subtle problem