removed unnecessary checks in construct