Some rwsen fix