TOREMOVE - temporary workaround