Fixed scan issue