fixed for POE & API