fixing exception hack