Fix wazzup in old casese&calls #1311