Fixes Bug from last commit --> NOW properly handles Subtype Change