Fixing STWPAN-19