Bug/shell session fix