fix for #SUREFIRE-1057