pull fix for bad commit e0a1a5 from development branch