adding fix for code element overflow