hack to make standard work better