Fix for #6 and #7