Bug Fix : wm_layer