Fix for empty wallet