reverted some of constructor to pass Travis test