Made a hack to make it work - this class will need to be removed soon.