master: fix for SWL