Fix for 44111cf