Fix for #2 and #3