Fix for bleeding types