Ironed out aforementioned bug