quick hack to close #233