Hack to make this work