Temporary workaround for #16