A workaround that closes issue #2