some potential fixes