sw bug fixed