304 bug fixed