Issues #42 and #35