Accepted solutions for #612 and #673