Fixed for new L# Common