Hopefully fix cal/craps?