Try a fix for CALI shapes