Reactivate support for PR #15