temp fix for non-termination issue