No longer crashes, contracts don't expand yet