Fix for #123