Fix for the abysmally designed .Net apis