Hack fix - investigate later