Workaround for #90