Temporary patch to fix Istanbul.