fixes for #35 and #53