Minor check all bug fix