Add workaround for (#176)