fixed WOrking case