agree -- this is a quick fix until we have a proper home for this