fixed some type ducking