Made figurenumber conditional as did prev. with tableNumber