Fixed code contracts