St3 fix. #22