#99 and #115 and #116