Fixed static/ issue