Attempt to circumvent issue #3