this is probably a proper fix in terms of robustness