Bug fix
Merge branch 'terminalChanges'