Addition to #48.