Issues #692 and #693