Stability Fix

Should work with mono now.