updated to not crash on POIS