Temporary fix for #1336