Terrible hack! Need to fix!!!