Gabriel Saveword fix