Add new constructors.
Bug corrected.