Fix for dot net