Reimplemented changes for v1.7.9