Updated / fixed bug in contracts