Patch v1.2

Order of constructor has been changed.