Fixed public credit check once and for all