Fix for #1