modifications for issue  #61