Should fix STWPAN-58