Fixed STWPAN-17