Fix for #1 and #2