Cannot simply remove this... we have to do something more intelligent here