temporary fix until #2103 get some love