Hickory-#54

#54