Constructor slightly changed.