seams to fix #2616 as well here