Added fix for contract creation state changes