proper fix for #983, 113b6610e4f5a1615093c8b1a2c8f60bac56698c was incorrect