Fixed errors for #2364. Good morning...