Fixed some cases which throws ZeroProbability