Fix for type re-definition issue