fixed STWPAN-30