this is a fine quickfix for now. I've gotta implement this.