Fix for #5 and #6