Fix for element codes