Fix layout hash issue