Fix multiple alias ... dirty but will do for now