Slight fix, will get class from bspkrs