This is indeed a "HACK", please just remove this... it's really hacky and it's redundant with the other less hacky way of solving this.