#105 and #109