fixed bug in remove/add elbs