Fix for contract validation