Workaround #3 for now [ci skip]