CLR fix