Things getting fixed i hope