added ad-hoc exception fix (still broken)