bugfix in Escape handling in tools