Fix issue827

Change-Id: If21e2a4efc69e46ee452353fc06507b3f890db0d
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/189
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Preston Carman <ecarm002@ucr.edu>
14 files changed