#17 No longer displays Empty