Possible workaround for #33.