removed Alberts workaround