Issues #139 and #144