Fix for selected target type