Fix for issue{.net}