fixed: SWDF-19