MASTER - show_all bug fix