Fixed Issue #1079 

 Fixed Issue #1079 
and fix locator