attempt fix, not tested