hopefully working patch