This is a quick hack to get around #1112