fixed dodgy BS