Work for #67 and #68