Fix Debug

@lingyan @mridgway