Yeah, you are right, this isn't optimal, will fix.