Fix issues #6 and #8