fixes for #115 and #114