Temporary workaround for #29